From a1da3cb380e99b76f140123bb8eeb61f53bb04af Mon Sep 17 00:00:00 2001 From: Drew Parsons Date: Sat, 20 Jun 2026 15:54:26 +0200 Subject: [PATCH] refresh patches --- debian/patches/30_drop_medical_example.patch | 6 +++--- debian/patches/gdal-3.13.patch | 10 ++++++---- debian/patches/matplotlib_nullptr_s390x.patch | 10 +++++----- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/debian/patches/30_drop_medical_example.patch b/debian/patches/30_drop_medical_example.patch index f30539ba3..c76a16618 100644 --- a/debian/patches/30_drop_medical_example.patch +++ b/debian/patches/30_drop_medical_example.patch @@ -3,9 +3,9 @@ Last-Update: 2020-10-21 Index: vtk9/Examples/CMakeLists.txt =================================================================== ---- vtk9.orig/Examples/CMakeLists.txt 2026-01-30 11:52:25.929361624 +0100 -+++ vtk9/Examples/CMakeLists.txt 2026-01-30 11:52:25.923037072 +0100 -@@ -63,7 +63,7 @@ +--- vtk9.orig/Examples/CMakeLists.txt 2026-06-20 15:53:41.922997656 +0200 ++++ vtk9/Examples/CMakeLists.txt 2026-06-20 15:53:41.909728170 +0200 +@@ -66,7 +66,7 @@ add_example(IO/Cxx) add_example(ImageProcessing/Cxx) add_example(Infovis/Cxx) diff --git a/debian/patches/gdal-3.13.patch b/debian/patches/gdal-3.13.patch index 51ee6860e..6eb5a546b 100644 --- a/debian/patches/gdal-3.13.patch +++ b/debian/patches/gdal-3.13.patch @@ -7,9 +7,11 @@ Description: Fix FTBFS with GDAL 3.13.0. " Author: Bas Couwenberg ---- a/IO/GDAL/vtkGDALRasterReader.cxx -+++ b/IO/GDAL/vtkGDALRasterReader.cxx -@@ -182,7 +182,11 @@ void vtkGDALRasterReader::vtkGDALRasterR +Index: vtk9/IO/GDAL/vtkGDALRasterReader.cxx +=================================================================== +--- vtk9.orig/IO/GDAL/vtkGDALRasterReader.cxx 2026-06-20 15:53:59.251124679 +0200 ++++ vtk9/IO/GDAL/vtkGDALRasterReader.cxx 2026-06-20 15:53:59.249472560 +0200 +@@ -182,7 +182,11 @@ this->Reader->DriverShortName = GDALGetDriverShortName(driver); this->Reader->DriverLongName = GDALGetDriverLongName(driver); @@ -21,7 +23,7 @@ Author: Bas Couwenberg if (CSLCount(papszMetaData) > 0) { for (int i = 0; papszMetaData[i] != nullptr; ++i) -@@ -878,7 +882,11 @@ std::vector vtkGDALRasterRe +@@ -882,7 +886,11 @@ { std::vector domainMetaData; diff --git a/debian/patches/matplotlib_nullptr_s390x.patch b/debian/patches/matplotlib_nullptr_s390x.patch index 090930072..264827275 100644 --- a/debian/patches/matplotlib_nullptr_s390x.patch +++ b/debian/patches/matplotlib_nullptr_s390x.patch @@ -1,10 +1,10 @@ Index: vtk9/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.cxx =================================================================== ---- vtk9.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.cxx 2026-01-25 23:22:22.741023671 +0100 -+++ vtk9/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.cxx 2026-02-05 12:10:11.414134274 +0100 -@@ -1029,6 +1029,12 @@ - { - unsigned char* ptr = static_cast(image->GetScalarPointer(col, row, 0)); +--- vtk9.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.cxx 2026-06-20 15:53:56.710944340 +0200 ++++ vtk9/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.cxx 2026-06-20 15:53:56.707945159 +0200 +@@ -1023,6 +1023,12 @@ + return false; + } + if (ptr == nullptr) + { -- 2.30.2